*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5020ef0da4e97a1ed33eb4bd0582e527960f2b8..61014b3103d1a9e2bd80c9514b19bf290d1c4aaf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * vc.el (vc-maybe-resolve-conflicts): Don't prompt the user.
+
        * calc/calc.el (calc-mode-map): Use mapc.
 
        * apropos.el (apropos-mode): Don't autoload.